Simplify shadow conditions

The code in gtkwindow.c for dealing with the various
combinations of client-side decorations and client-side
shadows is entirely too complicated.

This commit does not really clean it up, but simplifies
one of the shadow conditions far enough to make some
sense.

With this change, I get the expected decorations in
all the cases I can easily reproduce locally.

diff --git a/gtk/gtkwindow.c b/gtk/gtkwindow.c
index a21e7205c86d06d56ee09c5cb2363afa9d3021f2..88a4e9721a3c1fd0b85bbd531e2b46cc3eec1548 100644 (file)
--- a/gtk/gtkwindow.c
+++ b/gtk/gtkwindow.c
@@ -4005,9 +4005,8 @@ get_shadow_width (GtkWindow *window,
   if (!priv->decorated)
     goto out;
 
-  if (!priv->client_decorated &&
-      !(gtk_window_should_use_csd (window) &&
-        gtk_window_supports_client_shadow (window)))
+  if (!priv->client_decorated ||
+      !priv->use_client_shadow)
     goto out;
 
   if (priv->maximized ||